Bundle a copy of gtk-doc from the gtk-doc-for-gtk4 branch

Until support for GTK 4 actions is merged into gtk-doc git master,
including a suitable copy of gtk-doc in this source package lets us
build it without experimental's gtk-doc having to be the GTK 4 version.

It's currently version GTK_DOC_1_32-57-g3651bf3 from the
gtk-doc-for-gtk4 branch.

diff --git a/debian/control b/debian/control
index e6df6dc1db5172733fe79b6428cccddf645b1722..f02a8158fd4c9d82748e964e93bd4a0d0de3e327 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -52,8 +52,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                xauth <!nocheck>,
                xsltproc,
                xvfb <!nocheck>
-Build-Depends-Indep: gtk-doc-tools (>= 1.32+git20200421.gtk4),
-                     libcairo2-doc,
+Build-Depends-Indep: libcairo2-doc,
                      libglib2.0-doc,
                      libpango1.0-doc,
                      pandoc,

diff --git a/debian/control.in b/debian/control.in
index d748887288df3463b17267e7c9dc5d89839bb1f7..96abb2e41106112b929b4675520b35c834c00c61 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -52,8 +52,7 @@ Build-Depends: adwaita-icon-theme <!nocheck>,
                xauth <!nocheck>,
                xsltproc,
                xvfb <!nocheck>
-Build-Depends-Indep: gtk-doc-tools (>= 1.32+git20200421.gtk4),
-                     libcairo2-doc,
+Build-Depends-Indep: libcairo2-doc,
                      libglib2.0-doc,
                      libpango1.0-doc,
                      pandoc,

diff --git a/debian/gbp.conf b/debian/gbp.conf
index 7eebcaf2fd0bd210fbca3e1405c4af7abc1b51b6..c406802fc5ecebeb374c453a0d842206fe28ca73 100644 (file)
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -3,6 +3,7 @@ pristine-tar = True
 debian-branch = debian/master
 upstream-branch = upstream/latest
 upstream-vcs-tag = %(version)s
+component = gtk-doc-for-gtk4
 
 [buildpackage]
 sign-tags = True

diff --git a/debian/rules b/debian/rules
index ed69010ecd1d3131646e82a4b42637b5462045be..1c7dc288f0da579d5041748530294e4bb74373d8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -142,6 +142,7 @@ override_dh_clean: debian/control
 override_dh_auto_build: $(call dh_subst_files,$(all_binaries))
 
 override_dh_auto_configure: debian/control
+       ln -fns ../gtk-doc-for-gtk4 subprojects/gtk-doc
        dh_auto_configure \
                --builddirectory=debian/build/deb \
                -- \